Queues to kindergartens to be eliminated by 2020